refactor world class