General tidy up esp of chapter4