Tweak removing unnecessary instance variable
Upgrade thor