QA: Coding standards adjustments