renaming and simplifying things