Refactoring for reading