Updates have been made from code review