James C - more slight refactor