minor cleanups of joystick code
Merge branch 'integration' into joystick-cleanup
fixed spelling errors & more refactoring
Merge branch 'integration' into joystick-cleanup