Code /standards tidy Ref #991