Revert "Minor changes"

This reverts commit 4f155be0e49db913cbb029928458eb60cb868fb4.