Clean up variable names, don't use  for callback