No functionality change. Fix up some whitespace and switch out "" for '' when