cleanups and commenting