Altered the pretty printer to make it match the parser a little more