Add suggestions, reindent, delete stuff
Merge pull request #6 from Trevoke/master

Add suggestions, reindent, delete stuff