Clean-up the code