Refactored a few suggestions in the phone category
Remove accidental TODO
Merge pull request #29 from shalecraig/patch-6

Merge Shale's fixes.