don't do unnecessary css calls + refactoring