Namespace everything and refactor Vetting to use instance methods