Some coding standards improvements