cleaned up analyzer