Various whitespace, semicolons, and variables cleanup

Should be self-explanatory.