Refactoring for enhanced readability