minor Tidy up