done some prettifier improvements