rename variables and stuff