removed improper boolean variables