refactoring - avoiding the use of double quotes: changing to single quotes when possible!