Refactor. Method overload instead of optional parameters