RF: updated the suggestions from the github review
BF: variable name corrected