Small cleaning of code