Applied changes from James's code review