Cleanups and comments