Fixed whitespace errors

Fixed whitespace erros, so that prove xt/whitespaces.t would pass
reflect changes
Merge branch 'pr/whitespace_cleanup'