Cleanups and commenting.