Style update part 1
Merge pull request #1 from Hackademy2014/Joe

Style update part 1