refactor: cleanup IWRR properties