Refactor some styles