Change to single-quotes where possible
Formatting changes