Refactor styles, add csscomb