Make a slight DRY improvement