refactoring classnames