Clean code and implement JoyStick support for main controll