+ Slightly refactored the analyzer