minor style changes and strings escaped