some improvements
Revert "some improvements"

This reverts commit 3188789d9b0176f3d41ff1b16ff1b31dabe5bcff.