Some cleaning
Some cleaning