Progress in refactoring the big-ball-o-mud game class