Little changes removing variables