Addional refactoring to make class less complex and dry it up

Redundant curly braces around a hash parameter.