Cleanup and some refactoring of variable names.