Clean up of the code