Cleaning code
Cleaning code