Dialer: code cleanup

Change-Id: I0ec90509ac0c4b49b6c58d939a0cfe3ec0cc5aa0