Clean up of the code
Clean up of the code