clean up variable names.  still a mess.