Removed ELC op handlers
Reduced number of local variables
Reduced the number of local variables
Removed some variables in favor of expressions
Revert "Reduced the number of local variables"

This reverts commit b82c7dd343d43db7b200814657bfc5677afed392.