renaming
some cleanup