Clean up a bit of this mess