Clean up this mess a little