Refactoring the Analyser class