Minor code review cleanups