refactor 39