Made changes from Philip's code review