updated classnames and cleaned up stuff