Refactored execution paths for readability/convention