couple of DL macros
more tidy
tidy up