Added security check to phone number controller, cleaned up some code