Minor variable changes