Cleaning code and rename variables to make them more meaningful