Used local vars.
Merge pull request #2 from fidlej/topic_local_vars

Used local vars