More variable renaming and simplifications