Refactored and refomatted take turn