General tidy up

General tidy up