Clean up code in Analyzer Core module