Made variable names make a little more.... sense