cleanup in style
general cleanup and style
Merge pull request #1 from Genesiz/mergedUp

Merged up