Refactoring changes to 'Turn'