Adjusting and rename variables and comments