Changes as per Code Review by James Moger