Fifth step

Cleaning code