Minor Refactoring

Change of variable names for easier reading