Refactored Joystick

Removed hard-coded variables