refactored styling