Refactoring code

Changed name of the variables