rename variables to help user understand, remove unneeded ones