Refactoring of data read