remove printing debug info and update comments