Revert "refine readme; some code cleanups"

This reverts commit ccb7501ba81c07320468f8ee20d473dd70f9579a.