Fix clang warning about trailing semicolons.

Warning shows up with -Wsemicolon-before-method-body enabled.
Fix clang warning about shadowing local variables.

Warning shows up with -Wshadow enabled.
Merge pull request #113 from tijoinc/fix-clang-warnings

Fix Clang Warnings