Style!

Fixed a lot of style errors. This is only small changes, many parts of the project could use a refactor.
Merge master
Merge pull request #19 from totokaka/code-style

Style!