Code review cleanups