Style refactored