Improve the matching to code conventions