fix comments, rename variables