Updated code per morning code review