Improved code format - Removed unused variables and not necessary semicolons
Merge pull request #529 from soyuka/master

Removed unused variables and not necessary semicolons