Tidying unfinished business

Tidying unfinished business