Clean-up in the code