Fix some code style and whitespace errors.
[Dirk Hohndel: one hunk didn't apply as there was no such code...?]
Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>