HCSVLAB-249 Small code tidy up