Closes #765
Cleanup execute and options
use new joi features