Revert "Tweaks"

This reverts commit 7706aa62c0ce98b72180a0d3e4a266882e5901da.
More tweaks