General code format cleanup

OK, let's try this pull request again...