Clean up helpers some more