Some cleaning
Cleaning code