The code is copied from OWASP code. I only touched parts that I had to change. I would leave it like is to have minimal changes to original.