1) refactoring neatest structure to sharing style
2) gt -> goaltyp