Made variable names sensible