coding standards fixes