refactor 43