Refactored css