Updated variable names for readability
Merged Master