Fix potentiality DoS
Cleanup
Cleanup