Improve reusability of code