refactor 33