tidy up this mess