Added more logical/coherent variable names.