Igor Klajo: Maybe I should clean this up