refactored generators for joystick