Rename variables, try to document something