notes
renaming and cleaning