Refactoring for styles