Fixed Joystick type and cleaned up
Fixed Nunchuk type and cleaned up