Styleguide compliance
Merge pull request #9 from doomspork/styleguide-compliance

Styleguide compliance