some stylifying for match
Merge branch 'FEATURE_match_structure'