tidy up top of analyzer and compiler