clean up analyzer a bit