#465: Refactoring phone validator