Style refactoring