Various coding style fixes
Allow apostrophes inside string
Various coding style fixes
Various coding style fixes