Refactoring styles...