clean up and comments
clean up, renamed many classes