-Codechange: name a few variables
-Cleanup: remove useless code and simplify some checks