Normalize whitespace
Add some semicolons to client JS
Merge pull request #3 from michaelmior/refactor

Refactoring