removing some un-used variables

and some white space dfifs.