Cleanups in code and comments