[TASK] Coding style requirements cleanup