Cleared up some of the variable names, targeting the err ones mainly