Dialer: Code Cleanup

Change-Id: I2f9ad487b0fe937a9192aee79a970e54dad3d591