massive restyle.
Merge pull request #1 from Bronsa/master

Restyle.