Trivial typo fix

Update of previous pull request, just a bit cleaner in terms of structure.