cleaned up the mess