More code cleaning
More code cleaning