Addional refactoring to make class less complex and dry it up

Line is too long. [113/80]<br>Avoid using `rescue` in its modifier form.