Cleanup this mess a little