Micro-opt

Cuts in half the amount of file read calls.