Another part of reformatting and clean up.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>