Whitespace cleanup

and bugfix