Code edit - moves phone helpers together