Minor refact using TarReader