Updated variable names, abstracted and reduced code
Merge remote-tracking branch 'origin/master'