Lots o style changes.
Merge branch 'style' of github.com:jaluce/Like-A-Rock into style