Clean up of code.