Refactored helpers to extensions where possible