removed some variables and blank lines