cleanup: merge multiple methods into one

while I can see the merits of the old way this was done, I found it
too hard to keep the different names straight