Very quick cleaning of the code.