[misc] Improve reusability