Refactored a few suggestions in the phone category