Updated setup method to initialise joysticks
Changing joysticks to objects and cleaning out some common definitions