Refactored styles