feat: Refactor run functions for better maintainability and extendibility