More style fixes.

Making most lines less that 80 characters, adding spaces &cetera.  No major changes to functionality.