Addional refactoring to make class less complex and dry it up

Line is too long. [90/80]<br>Redundant curly braces around a hash parameter.