Changes according Dominic's review notes:
  fix wording
  fix indentation
  fix variable's names