Slightly improved reading speed
Minor polishing