Minor changes to variables