More cleaning!!! MUST test the code.