refactor 41