much refactors
Merge pull request #4 from SmashCoders/styling

much refactors