update clean_city
fix clean_homephone
add Queue#print
add print_by
clean up cli
fixes merge conflict clean-up-cli
Merge branch 'clean-up-cli'