Fix stylistic issues

Fix some stylistic issues with the source code. Primarily alignment of
variable names and function prototypes.

Signed-off-by: Marcus Karlsson <mk@acc.umu.se>