Merge branch 'codeStyleExtractor'