Fix whitespace issues

Fix issues found by niceness check

Change-Id: I5a95c873690951f9571c81771043cc7a1d38397e