Buffer threshold parameter. Code cleanup.
Restructure form reader. Flush out file reading logic.