Remove some debug lines, rename variables to match style