Style changes (mostly through GNU Indent)