Make sure all lines end in semicolons.  Remove useless comment.

Also slightly reorganized some stuff.