More cleanup in Execute validation
Fixed route names to be more consistent
Merge pull request #18 from hpence/develop

Route naming fix and more code cleanup