style refactored