Various refactorings

Redundant curly braces around a hash parameter.