class name tidy up