Refactor ISO class