Refactor excel reader