cleanup, better variable names