Cleanups in code