General code cleanup, variable name changes