tvondra minor improvements - mostly formatting etc.

Users who have contributed to this file

• tvondra