cleaning up, more clear variable names