Refactor styles