Clean up my coding by removing some of the un-needed var prefix.