Cleanup and renaming variables more intiutively.