Some review cleanups