refactors style
Merge branch 'oocss'