Replaced pi references with $USER, added $ to variable names