Revert "Minor changes"

This reverts commit 1fb3a8947dfed01aad7fb9478f002c737e16d67a.