Just a little formatting, and removing ifPossible as it's now the
default