Refactoring and cleanup css