More Functionalization

Switched to more standard user-input variable names
Further removal of functional code from RSG.ML to elsewhere