cleanup
renaming
removing neat graphics