removed and fixed variables