Clean-up of code.