Coding standards improvements - 2nd part