run astyle

Let us hope everybody figures out how to merge these changes.