cleanup and found error heh