Refactored Styling