Dialer: Code cleanup

Change-Id: Id223441085c44c8da2a6a049884dbac1cd76217c