Some more code clean up and variable renaming.