Turn by turn simulation refactoring part 1