minor styling, comments etc
more minor stuff
Merge pull request #1 from gaya-/master

just minor styling etc