Cleans up style
Merge pull request #24 from Ayyzee/cleanup

Cleans up style