refactoring + omnibus