Cleanups, comments