Quote formatting + comment cleanup