Small cleanup for code review