Some clean/tidy up