More refactoring to use `$USER` rather than `geni`