- [study] optimized pre-processing, according to issue #21.