Minor cleanups and notes