Addional refactoring to make class less complex and dry it up

Useless assignment to variable - `options`.