refactor 49