Refactor based on coffeelint
Add all new styling