Cleaning up in code.