small code review cleanups