Reorganizes methods in analyzer for improved readability