Refactor 10226