Fixed code. It works now! Still WIP for Joel to finish.
Merge pull request #1 from tminard/style_fixes

Fixed code. Still WIP to finish.