Cleaning up name display