adjust indent
remove trailing spaces
Merge pull request #2160 from nobu/space

Space