Reduce local variables
Merge pull request #1 from kachick/improve-reduce_local_variable

Reduce local variables