Fixed up changed suggested in code review