follow pretty printer conventions more closely