Remove trailing whitespace, some cleanup
Merge pull request #1 from mar-kolya/master

Remove trailing whitespace, some cleanup