Small refactoring to improve readability