clean up class names