Code clean-up, variable renaming