Fixed some format output and standarized the use of quotes