Fix code not compliant with coding standards