cleanup

Hi, I did this small modifications while reusing your code.