inspection related tidyups