Reorganize Turn handling