Simplified coding standard; improved code readability.

Relaxed some parts of the coding standard, resulting in a more idiomatic style.
Automatic changes from "second build".