code cleaning and player joystick tweak