refactor 38