Revert "Minor Tweaks"

This reverts commit f55c2ad1296e3d18359f04be2faf5aa206ec0d9f.