Revert "more small improvemets"

This reverts commit 6676315e1eae7f1ecf9c7adfc37fdae95401d8b4.