Refactor to use classnames