Refactored the overload solution

Line is too long. [85/80]