Add a ontap-helper method, improve readability, add a test