Minor tweaks
Revert "Minor tweaks"

This reverts commit 91035ad4e533a871a8904edf0c7012ed4c8c5d8a.