Code standard update: whitespace and change double quotes to single