Various whitespace, semicolons, and variables cleanup
Merge pull request #620 from mc10/minor-fixes

Various whitespace, semicolons, and variables cleanup