stylistic consistency and misc changes

Use single quotes more consistently and wrap object vars in a string in braces for readability's sake.