Made variables local
Commented-out debug information