General tidy up to start with commits