Refactor Styles