refactor 26