more descriptive variable names
fixes suggested by @macu