Some commenting and cleanups.