Enhanced detection of the presence and severity of COVID-19 from CT scans using lung segmentation