Refactoring for clarity