refactor 36