More clarity in variable names, refactored values.