Improved code style and seperated control colidate for knight into a new
class