Refactored endturn()