reduced scanner memory allocation
3 files changed