Refactor for PR#86
Refactor for PR#86

wilfreddekok/Antidote,wilfreddekok/Antidote,dvor/Antidote,Antidote-for-Tox/Antidote,Antidote-for-Tox/Antidote,dvor/Antidote,wilfreddekok/Antidote,dvor/Antidote,dvor/Antidote,Antidote-for-Tox/Antidote,wilfreddekok/Antidote,Antidote-for-Tox/Antidote