Using the new helper and simplifying some code