removed some used var's
fixed notice