Refactoring phone app
Several problems has occurred