Improvements to Quote format style