little bit of neatening
these are in lib now