refactor out the bad practice of duplicating/masking keys