Content and style refactoring