Some cleanups in code.