Refactor WOTWP