refactor 32