cleaning up this mess