Revert "Minor adjustments"

This reverts commit 2d97e8d41aabf8fe84e27024a5d1dc49c04a5e01.