mehh cleaning up the mess