Code style improvements

Signed-off-by: Joachim Eckerlin <joachim.eckerlin@gmail.com>