Addional refactoring to make class less complex and dry it up

Line is too long. [92/80]