Some clean up. But the thing is slow as shit