Code review. Coding styles adjustments.