Implemented players turn and code cleanup