Fix a couple of indentation and review comments for last commit

Signed-off-by: Carsten Munk <carsten.munk@jollamobile.com>