Some changes

Extra lines removed; unnecessary variable removed