Refactored style