diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_AlignCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_AlignCondAlg.cxx
index 1319aa5dd01aea5f9eddb7018a0811ce60f520cc..47e93011008edf57009fc386f6cb35c0b35706f4 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_AlignCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_AlignCondAlg.cxx
@@ -25,11 +25,11 @@ StatusCode SCT_AlignCondAlg::initialize()
 
   // Read Handles
   // Static
-  ATH_CHECK(m_readKeyStatic.initialize(!m_useDynamicAlignFolders.value()));
+  ATH_CHECK(m_readKeyStatic.initialize(not m_useDynamicAlignFolders));
   // Dynamic
-  ATH_CHECK(m_readKeyDynamicL1.initialize(m_useDynamicAlignFolders.value()));
-  ATH_CHECK(m_readKeyDynamicL2.initialize(m_useDynamicAlignFolders.value()));
-  ATH_CHECK(m_readKeyDynamicL3.initialize(m_useDynamicAlignFolders.value()));
+  ATH_CHECK(m_readKeyDynamicL1.initialize(m_useDynamicAlignFolders));
+  ATH_CHECK(m_readKeyDynamicL2.initialize(m_useDynamicAlignFolders));
+  ATH_CHECK(m_readKeyDynamicL3.initialize(m_useDynamicAlignFolders));
 
   // Write Handles
   ATH_CHECK(m_writeKey.initialize());
@@ -67,7 +67,7 @@ StatusCode SCT_AlignCondAlg::execute()
   // ____________ Construct new Write Cond Object ____________
   std::unique_ptr<GeoAlignmentStore> writeCdo{std::make_unique<GeoAlignmentStore>()};
 
-  if (not m_useDynamicAlignFolders.value()) { // Static
+  if (not m_useDynamicAlignFolders) { // Static
     // ____________ Get Read Cond Object ____________
     SG::ReadCondHandle<AlignableTransformContainer> readHandleStatic{m_readKeyStatic};
     const AlignableTransformContainer* readCdoStatic{*readHandleStatic};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.cxx
index a5484e9c6e2623b2a5e6b15b3315ff23d403bb8a..f6d5f4bedc1edb869304a34881f1b4aa18b402d3 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.cxx
@@ -422,7 +422,7 @@ SCT_ConfigurationCondAlg::getStripId(const unsigned int truncatedSerialNumber, c
   if (not waferId.is_valid()) return invalidIdentifier;
 
   const InDetDD::SiDetectorElement* pElement{elements->getDetectorElement(waferHash)};
-  if (!pElement) {
+  if (pElement==nullptr) {
     ATH_MSG_FATAL("Element pointer is nullptr in 'getStripId' method");
     return invalidIdentifier;
   }
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.cxx
index 5cd9eb80f3cbbc3d93be7736338a39422d9d5f44..ac408a08916ae86d58f750597fe09769ce14aae0 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.cxx
@@ -19,11 +19,11 @@ StatusCode SCT_DCSConditionsHVCondAlg::initialize() {
   // CondSvc
   ATH_CHECK(m_condSvc.retrieve());
 
-  if (m_returnHVTemp.value()) {
-    // Read Cond Handle
-    ATH_CHECK(m_readKey.initialize());
-    // Write Cond Handle
-    ATH_CHECK(m_writeKey.initialize());
+  // Read Cond Handle
+  ATH_CHECK(m_readKey.initialize(m_returnHVTemp));
+  // Write Cond Handle
+  ATH_CHECK(m_writeKey.initialize(m_returnHVTemp));
+  if (m_returnHVTemp) {
     if (m_condSvc->regHandle(this, m_writeKey).isFailure()) {
       ATH_MSG_FATAL("unable to register WriteCondHandle " << m_writeKey.fullKey() << " with CondSvc");
       return StatusCode::FAILURE;
@@ -36,7 +36,7 @@ StatusCode SCT_DCSConditionsHVCondAlg::initialize() {
 StatusCode SCT_DCSConditionsHVCondAlg::execute(const EventContext& ctx) const {
   ATH_MSG_DEBUG("execute " << name());
 
-  if (not m_returnHVTemp.value()) {
+  if (not m_returnHVTemp) {
     return StatusCode::SUCCESS;
   }
 
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.cxx
index aa6515fac152d4df67c58d268af3ea84c56b7a42..493e00af0ae52f0043dd69f82a0de5091137b6dc 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.cxx
@@ -16,24 +16,24 @@ SCT_DCSConditionsStatCondAlg::SCT_DCSConditionsStatCondAlg(const std::string& na
 StatusCode SCT_DCSConditionsStatCondAlg::initialize() {
   ATH_MSG_DEBUG("initialize " << name());
 
-  m_doState = ((m_readAllDBFolders.value() and m_returnHVTemp.value()) or (not m_readAllDBFolders.value() and not m_returnHVTemp.value()));
+  m_doState = ((m_readAllDBFolders and m_returnHVTemp) or (not m_readAllDBFolders and not m_returnHVTemp));
 
   // CondSvc
   ATH_CHECK(m_condSvc.retrieve());
 
   // Read Cond Handle (HV)
-  ATH_CHECK(m_readKeyHV.initialize(m_returnHVTemp.value()));
+  ATH_CHECK(m_readKeyHV.initialize(m_returnHVTemp));
 
   // Read Cond Handle (state)
   ATH_CHECK(m_readKeyState.initialize(m_doState));
   // Write Cond Handle
   ATH_CHECK(m_writeKeyState.initialize(m_doState));
-  if (m_doState && m_condSvc->regHandle(this, m_writeKeyState).isFailure()) {
+  if (m_doState and m_condSvc->regHandle(this, m_writeKeyState).isFailure()) {
     ATH_MSG_FATAL("unable to register WriteCondHandle " << m_writeKeyState.fullKey() << " with CondSvc");
     return StatusCode::FAILURE;
   }
 
-  if (m_useDefaultHV.value()) {
+  if (m_useDefaultHV) {
     m_hvLowLimit = m_useHVLowLimit;
     m_hvUpLimit = m_useHVUpLimit;
     m_chanstatCut = m_useHVChanCut;
@@ -110,7 +110,7 @@ StatusCode SCT_DCSConditionsStatCondAlg::execute(const EventContext& ctx) const
     }
   }
 
-  if (m_returnHVTemp.value()) {
+  if (m_returnHVTemp) {
     // Read Cond Handle 
     SG::ReadCondHandle<CondAttrListCollection> readHandleHV{m_readKeyHV, ctx};
     const CondAttrListCollection* readCdoHV{*readHandleHV};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.cxx
index 99b5660225983cad3badaedbe625a69f4f59f252..267ac0251974b76ebf53a692bbe063435fd0d91d 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.cxx
@@ -19,11 +19,11 @@ StatusCode SCT_DCSConditionsTempCondAlg::initialize() {
   // CondSvc
   ATH_CHECK(m_condSvc.retrieve());
 
-  if (m_returnHVTemp.value()) {
-    // Read Cond Handle
-    ATH_CHECK(m_readKey.initialize());
-    // Write Cond Handles
-    ATH_CHECK(m_writeKey.initialize());
+  // Read Cond Handle
+  ATH_CHECK(m_readKey.initialize(m_returnHVTemp));
+  // Write Cond Handles
+  ATH_CHECK(m_writeKey.initialize(m_returnHVTemp));
+  if (m_returnHVTemp) {
     if (m_condSvc->regHandle(this, m_writeKey).isFailure()) {
       ATH_MSG_FATAL("unable to register WriteCondHandle " << m_writeKey.fullKey() << " with CondSvc");
       return StatusCode::FAILURE;
@@ -36,7 +36,7 @@ StatusCode SCT_DCSConditionsTempCondAlg::initialize() {
 StatusCode SCT_DCSConditionsTempCondAlg::execute(const EventContext& ctx) const {
   ATH_MSG_DEBUG("execute " << name());
 
-  if (not m_returnHVTemp.value()) {
+  if (not m_returnHVTemp) {
     return StatusCode::SUCCESS;
   }
 
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipDataTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipDataTestAlg.cxx
index 1ac57c5c893a21b00e1c52710f7be8f142b8ddf8..8cc6b27c28bf6cea276748182c110788173c34ed 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipDataTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipDataTestAlg.cxx
@@ -95,7 +95,7 @@ StatusCode SCT_ReadCalibChipDataTestAlg::execute(const EventContext& ctx) const
                 << "]");
 
   //Test Chip Data ConditionsSummary
-  if (m_doTestmyConditionsSummary.value()) {
+  if (m_doTestmyConditionsSummary) {
     // Test summmary, ask status of strip in module
     Identifier IdM{m_moduleId};
     Identifier IdS{m_waferId};
@@ -104,7 +104,7 @@ StatusCode SCT_ReadCalibChipDataTestAlg::execute(const EventContext& ctx) const
   }
 
   //Test data summary
-  if (m_doTestmyDataSummary.value()) {
+  if (m_doTestmyDataSummary) {
     // Test to get some data from the NPtGain or NoiseOccupancy
     Identifier Id{m_moduleId};
     const int side{1};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataTestAlg.cxx
index ec789f13c9bbdd8a83aeb7ec6c82e56c1b85d6ac..1e1ba6d17597c99c3caba92a5b2d00132568183f 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataTestAlg.cxx
@@ -95,7 +95,7 @@ StatusCode SCT_ReadCalibDataTestAlg::execute(const EventContext& ctx) const
   ATH_MSG_DEBUG("in execute()");
   
   //Test ConditionsSummary
-  if (m_doTestmyConditionsSummary.value()) {
+  if (m_doTestmyConditionsSummary) {
     // Test summmary, ask status of strip in module
     Identifier IdM{m_moduleId};
     Identifier IdS{m_stripId};
@@ -104,7 +104,7 @@ StatusCode SCT_ReadCalibDataTestAlg::execute(const EventContext& ctx) const
   }
 
   // Loop over all strips and check if good or not using isGood, and print the bad ones
-  if (m_doTestmyDefectIsGood.value()) {
+  if (m_doTestmyDefectIsGood) {
     int ngood{0};
     int nbad{0};
     //Loop over all wafers using hashIds from the cabling service
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadoutTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadoutTestAlg.cxx
index 8f8df3467ce6cf2be5e9abff0765c27cf0405259..dbf7f778e8cad554931b5dd10fa0f2cd70205c4b 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadoutTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadoutTestAlg.cxx
@@ -51,7 +51,7 @@ StatusCode SCT_ReadoutTestAlg::execute() {
   for (const SCT_Chip& chip: m_chips) ATH_MSG_INFO(chip);
 
   // Determin readout for this module
-  ATH_CHECK(m_readout->determineReadout(Identifier{m_moduleId.value()}, m_chips, m_link0ok.value(), m_link1ok.value()));
+  ATH_CHECK(m_readout->determineReadout(Identifier{m_moduleId}, m_chips, m_link0ok, m_link1ok));
   
   ATH_MSG_INFO("Chips after readout ...");
   for (const SCT_Chip& chip: m_chips) ATH_MSG_INFO(chip);
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SensorsCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SensorsCondAlg.cxx
index 65da127a83f2991b27c261c0f1e1d4a6f051012f..2641d89e9eea1bc4e228da940503b80bb2e31ff5 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SensorsCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SensorsCondAlg.cxx
@@ -16,13 +16,13 @@ StatusCode SCT_SensorsCondAlg::initialize()
   ATH_MSG_DEBUG("initialize " << name());
 
   // CondSvc
-  ATH_CHECK( m_condSvc.retrieve() );
+  ATH_CHECK(m_condSvc.retrieve());
 
   // Read Cond Handle
-  ATH_CHECK( m_readKey.initialize() );
+  ATH_CHECK(m_readKey.initialize());
 
   // Write Cond Handle
-  ATH_CHECK( m_writeKey.initialize() );
+  ATH_CHECK(m_writeKey.initialize());
   // Register write handle
   if (m_condSvc->regHandle(this, m_writeKey).isFailure()) {
     ATH_MSG_FATAL("unable to register WriteCondHandle " << m_writeKey.fullKey() << " with CondSvc");
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconHVCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconHVCondAlg.cxx
index 8df228c2195bdbe5f9a52aefd3e56e49fa229dc3..3fc2c532d065877e23a4533f3f0de53130f63272 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconHVCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconHVCondAlg.cxx
@@ -25,7 +25,7 @@ StatusCode SCT_SiliconHVCondAlg::initialize() {
   // CondSvc
   ATH_CHECK(m_condSvc.retrieve());
   // Read Cond Handles
-  ATH_CHECK(m_readKeyState.initialize (m_useState.value()));
+  ATH_CHECK(m_readKeyState.initialize(m_useState));
   ATH_CHECK(m_readKeyHV.initialize());
   // Write Cond Handle
   ATH_CHECK(m_writeKey.initialize());
@@ -60,7 +60,7 @@ StatusCode SCT_SiliconHVCondAlg::execute(const EventContext& ctx) const {
   writeHandle.addDependency(readHandleHV);
   ATH_MSG_INFO("Input is " << readHandleHV.fullKey() << " with the range of " << readHandleHV.getRange());
 
-  if (m_useState.value()) {
+  if (m_useState) {
     // Read Cond Handle (state)
     SG::ReadCondHandle<SCT_DCSStatCondData> readHandleState{m_readKeyState, ctx};
     const SCT_DCSStatCondData* readCdoState{*readHandleState};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconTempCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconTempCondAlg.cxx
index 29a600b3657a8ea8b4431b6e49d3c22ca7c95162..5e6274485444479759ae22ab215ddee2a7001737 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconTempCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconTempCondAlg.cxx
@@ -25,7 +25,7 @@ StatusCode SCT_SiliconTempCondAlg::initialize() {
   // CondSvc
   ATH_CHECK(m_condSvc.retrieve());
   // Read Cond Handle
-  ATH_CHECK(m_readKeyState.initialize (m_useState.value()));
+  ATH_CHECK(m_readKeyState.initialize(m_useState));
   ATH_CHECK(m_readKeyTemp0.initialize());
   // Write Cond Handles
   ATH_CHECK(m_writeKey.initialize());
@@ -60,7 +60,7 @@ StatusCode SCT_SiliconTempCondAlg::execute(const EventContext& ctx) const {
   writeHandle.addDependency(readHandleTemp0);
   ATH_MSG_INFO("Input is " << readHandleTemp0.fullKey() << " with the range of " << readHandleTemp0.getRange());
 
-  if (m_useState.value()) {
+  if (m_useState) {
     // Read Cond Handle (state)
     SG::ReadCondHandle<SCT_DCSStatCondData> readHandleState{m_readKeyState, ctx};
     const SCT_DCSStatCondData* readCdoState{*readHandleState};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.cxx
index 7b31286419979913ad84d66fd38c197a9f6560fe..41f7627254163d9b6203fdc2dbbad85c4c3a9ff3 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.cxx
@@ -18,15 +18,15 @@ StatusCode SCT_TdaqEnabledCondAlg::initialize()
   ATH_MSG_DEBUG("initialize " << name());
 
   // CondSvc
-  ATH_CHECK( m_condSvc.retrieve() );
+  ATH_CHECK(m_condSvc.retrieve());
   // SCT cabling tool
-  ATH_CHECK( m_cablingTool.retrieve() );
+  ATH_CHECK(m_cablingTool.retrieve());
 
   // Read Cond Handle
-  ATH_CHECK( m_readKey.initialize() );
+  ATH_CHECK(m_readKey.initialize());
 
   // Write Cond Handle
-  ATH_CHECK( m_writeKey.initialize() );
+  ATH_CHECK(m_writeKey.initialize());
   // Register write handle
   if (m_condSvc->regHandle(this, m_writeKey).isFailure()) {
     ATH_MSG_FATAL("unable to register WriteCondHandle " << m_writeKey.fullKey() << " with CondSvc");
@@ -126,7 +126,7 @@ StatusCode SCT_TdaqEnabledCondAlg::execute(const EventContext& ctx) const
       writeCdo->setFilled(true);
     } 
 
-    if (!readHandle.range(rangeW)) {
+    if (not readHandle.range(rangeW)) {
       ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle.key());
       return StatusCode::FAILURE;
     }
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_DCSConditionsTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_DCSConditionsTool.cxx
index 7dee002d760688df2448203431807ba94521ef75..3179748df10c58c342c09b5fdb4971a43552a484 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_DCSConditionsTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_DCSConditionsTool.cxx
@@ -29,11 +29,10 @@ StatusCode SCT_DCSConditionsTool::initialize() {
   }
   
   // Read Cond Handle Keys
-  bool useHVTemp = (m_readAllDBFolders and m_returnHVTemp) or m_returnHVTemp;
-  ATH_CHECK(m_condKeyHV.initialize (useHVTemp));
-  ATH_CHECK(m_condKeyTemp0.initialize (useHVTemp));
+  ATH_CHECK(m_condKeyHV.initialize(m_returnHVTemp));
+  ATH_CHECK(m_condKeyTemp0.initialize(m_returnHVTemp));
 
-  bool useState = (m_readAllDBFolders and m_returnHVTemp) or (not m_readAllDBFolders and not m_returnHVTemp);
+  const bool useState = (m_readAllDBFolders and m_returnHVTemp) or (not m_readAllDBFolders and not m_returnHVTemp);
   ATH_CHECK(m_condKeyState.initialize(useState));
 
   return StatusCode::SUCCESS;
@@ -72,7 +71,7 @@ bool SCT_DCSConditionsTool::isGood(const Identifier& elementId, const EventConte
 
   if ((m_readAllDBFolders and m_returnHVTemp) or (not m_readAllDBFolders and not m_returnHVTemp)) {
     const SCT_DCSStatCondData* condDataState{getCondDataState(ctx)};
-    if (!condDataState) return false; // no cond data
+    if (condDataState==nullptr) return false; // no cond data
     else if (condDataState->output(castId(moduleId))==0) return true; //No params are listed as bad
     else return false;
   } else {
@@ -106,7 +105,7 @@ float SCT_DCSConditionsTool::modHV(const Identifier& elementId, const EventConte
   if (not moduleId.is_valid()) return s_defaultHV; // not canreportabout, return s_defaultHV(-30)
 
   const SCT_DCSFloatCondData* condDataHV{getCondDataHV(ctx)};
-  if (!condDataHV) return s_defaultHV; // no cond data
+  if (condDataHV==nullptr) return s_defaultHV; // no cond data
 
   float hvval{s_defaultHV};
   if (condDataHV->getValue(castId(moduleId), hvval) and isGood(elementId, h)) {
@@ -138,7 +137,7 @@ float SCT_DCSConditionsTool::hybridTemperature(const Identifier& elementId, cons
   if (not moduleId.is_valid()) return s_defaultTemperature; // not canreportabout
 
   const SCT_DCSFloatCondData* condDataTemp0{getCondDataTemp0(ctx)};
-  if (!condDataTemp0) return s_defaultTemperature; // no cond data
+  if (condDataTemp0==nullptr) return s_defaultTemperature; // no cond data
 
   float temperature{s_defaultTemperature};
   if (condDataTemp0->getValue(castId(moduleId), temperature) and isGood(elementId, h)) {
@@ -170,7 +169,7 @@ float SCT_DCSConditionsTool::sensorTemperature(const Identifier& elementId, cons
   if (not moduleId.is_valid()) return s_defaultTemperature; // not canreportabout
 
   const SCT_DCSFloatCondData* condDataTemp0{getCondDataTemp0(ctx)};
-  if (!condDataTemp0) return s_defaultTemperature; // no cond data
+  if (condDataTemp0==nullptr) return s_defaultTemperature; // no cond data
 
   float temperature{s_defaultTemperature};
   if (condDataTemp0->getValue(castId(moduleId), temperature) and isGood(elementId, h)) {
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_LinkMaskingTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_LinkMaskingTool.cxx
index 7dd63516a9153b252e2a13077d796234438afb92..3f9b5493b2c165cd2f9cfc56af1696d5beb4248b 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_LinkMaskingTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_LinkMaskingTool.cxx
@@ -24,7 +24,7 @@ StatusCode SCT_LinkMaskingTool::initialize() {
   }
 
   // Read Cond Handle
-  CHECK(m_condKey.initialize());
+  ATH_CHECK(m_condKey.initialize());
 
   return StatusCode::SUCCESS;
 }
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ModuleVetoTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ModuleVetoTool.cxx
index 710eb6d17ef397d22faa1d87336e2cb6763aac5d..f13896cd220c6ad3b2485a0b0a19656e4c009c79 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ModuleVetoTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ModuleVetoTool.cxx
@@ -64,7 +64,7 @@ SCT_ModuleVetoTool::initialize() {
   }
 
   // Read Cond Handle
-  CHECK(m_condKey.initialize(m_useDatabase));
+  ATH_CHECK(m_condKey.initialize(m_useDatabase));
 
   const std::string databaseUseString{m_useDatabase ? "" : "not "};
   ATH_MSG_INFO("Initialized veto service with data, "
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.cxx
index eb86301d01d86e6ea4e26007c9d56510d3606c84..ed11f1cda870f98ec55e50dc0fceb4ef5437c555 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.cxx
@@ -73,7 +73,7 @@ bool SCT_ReadCalibDataTool::isGood(const Identifier& elementId, const EventConte
       // Get strip on wafer to check
       int strip{m_id_sct->strip(elementId)};
       // Set value
-      status = (*condDataInfo)[waferHash.value()][strip];
+      status = (*condDataInfo)[waferHash][strip];
       break;
     }
   case InDetConditions::SCT_MODULE:
@@ -309,7 +309,7 @@ std::list<Identifier> SCT_ReadCalibDataTool::defectList(const std::string& defec
       }  else if (noDefect) {
         wantedDefects = condDataNoise->findModule(moduleId);
       }
-      if (!wantedDefects.begDefects.empty()) {
+      if (not wantedDefects.begDefects.empty()) {
         for (unsigned int i{0}; i < wantedDefects.begDefects.size(); ++i) {
           if (wantedDefects.typeOfDefect[i] == defect) {
             // Create identifier for all strips inside begin to end
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadoutTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadoutTool.cxx
index f9842458af648f9ad2b071926eaac0347066aef4..a22968b616775bb552e3cd7f30a83775271c1de3 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadoutTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadoutTool.cxx
@@ -21,7 +21,7 @@ SCT_ReadoutTool::SCT_ReadoutTool(const std::string& type, const std::string& nam
 StatusCode SCT_ReadoutTool::initialize() {
   ATH_MSG_DEBUG("Initialize SCT_ReadoutTool");
   // Retrieve cabling
-  if (!m_cablingTool.empty()) {
+  if (not m_cablingTool.empty()) {
     ATH_CHECK(m_cablingTool.retrieve());
   }
   // Retrieve SCT helper
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_SiliconConditionsTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_SiliconConditionsTool.cxx
index 955b962ae92c46a86139546bd6547bb49c47a46c..85bf40301631d1555a64f1177a3e3eee26f189ea 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_SiliconConditionsTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_SiliconConditionsTool.cxx
@@ -34,8 +34,8 @@ StatusCode SCT_SiliconConditionsTool::initialize() {
     }
   } 
 
-  ATH_CHECK(m_condKeyHV.initialize ((not m_useGeoModel) && m_useDB));
-  ATH_CHECK(m_condKeyTemp.initialize ((not m_useGeoModel) && m_useDB));
+  ATH_CHECK(m_condKeyHV.initialize((not m_useGeoModel) and m_useDB));
+  ATH_CHECK(m_condKeyTemp.initialize((not m_useGeoModel) and m_useDB));
 
   if (not m_useGeoModel) {
     ATH_MSG_INFO("Will use temperature and voltages from this service (not from GeoModel).");
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_TdaqEnabledTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_TdaqEnabledTool.cxx
index f9e08bcf3fec12a6adfce71e2e786e80d85e1e75..fdf223b720b0f88f95352f0e8afa08fc375dad40 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_TdaqEnabledTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_TdaqEnabledTool.cxx
@@ -28,9 +28,8 @@ SCT_TdaqEnabledTool::initialize() {
 
   ATH_CHECK(detStore()->retrieve(m_pHelper,"SCT_ID"));
   // Read Cond Handle Key
-  if (m_useDatabase) {
-    ATH_CHECK(m_condKey.initialize());
-  }
+  ATH_CHECK(m_condKey.initialize(m_useDatabase));
+
   return StatusCode::SUCCESS;
 }
 
@@ -63,7 +62,7 @@ SCT_TdaqEnabledTool::isGood(const Identifier& elementId, InDetConditions::Hierar
 bool
 SCT_TdaqEnabledTool::isGood(const IdentifierHash& hashId, const EventContext& ctx) const {
   const SCT_TdaqEnabledCondData* condData{getCondData(ctx)};
-  if (!condData) return false;
+  if (condData==nullptr) return false;
   return condData->isGood(hashId);
 }