tag code and disp cleanup