Cleanups after reviewing.