Removed turn
Some code beautification