major styling update. I'm sure jshint would have a field day before this..