Tidy up and add description