Declare variables, add missing semicomons, indent
Merge pull request #5 from carlossg/minor-fixes

Declare variables, add missing semicomons, indent