cleanup and add a variable of minor importance