helpers: Refactored into classes