Refactor controller verfication