fix class name
fix clobber
spacing