fixing style and TYP-file