Updated from code review