Made variable names more explicit