Tidying up
Tidy up and Inspection fixes.