Cleanups for code review