Phone parser refactor