Refactored styling and coding