Minor cleanups and commenting