Minor cleanup for code review