Revert "tweaks"

This reverts commit 2b3c4f27b9008ae2f780d05210b2b27132df1c9d.