Another quick tidy up