Renaming functions/vars for clarity, implementing scale switching