First cleaning of code.