Astyle of some files

Applying of approved code style to the existing code, nothing else.

Ignore this PR if it conflict with some other PRs.