tidy up, adaptive quote convention