Revert "small tweaks2"

This reverts commit 44b120a8ee3e696ddbb26b3c12e44a40a70a0fbc.