Refactored variable naming
Removed unnecessary binding on function invocations
Added binding on necessary function invocations