Refactored styling