Refactoring: rename Typ to Type
Refactor: rename 'typ' attributes to 'type'
Refactor: get rid of Annotation objects

They served no purpose at all and only complicated code.