SPRNET-1563 Make code as ClsCompliant as possible