converted double quotes to single quotes where appropriate
modifications designed to ease the refactoring process