Hardening/style guide common

(On behalf of @kzangeli )

New version of PR #481 , but againts the right branch with the new "way of working" after CC. Note that compared with PR #481 the number of added removed lines is exactly the same (a kind of checksum assuring the the new PR was rightly created :)