many small changes
Revert "many small changes"

This reverts commit f39761f8096e831b6ea08510b04722966de97fd4.