Align with coding standards