style changes: Use ' when appropriate
more style changes: use ' when appropriate