Removing more old code and renaming nicer code to better name