Refactored variable names
Merging