cleaned up some more variable names and function names