Clean-up the code.