Aubus refactor