Tidy up resolving to a more standard pattern