Minor cleanups from code review