conditionalize type printing
cleanups