Addional refactoring to make class less complex and dry it up

Indent the right brace the same as the first position after the preceding left parenthesis.