cleaning up + refactoring owlpdm tools to wrap fns in classes