Some cleaning of the code.