Suggestions from code review