Remove trailing spaces
Merge branch 'cleanup'