Fixed some sonar errors
Reduced complexity of makeTurn()