refactor domain_name and correct user variable references