Tidy up plus a little more