Use proposed coding style
Merge branch 'cleanup' into defines

Merge cleanup codings style commit as i accidentally used that branch as
the base.