Removed all trailing spaces
Fixed formatting issues
Merge pull request #95 from g0tmi1k/trailingspaces

Fix trailing spaces & formatting issues