Refactor listeners

Move handling of variables to onEnable()