Change of Variable names and spacing