change main class
clean up