- Minor refactoring to increase readability