Revert "Minor changes"

This reverts commit b123eddf9d80c2383028681f99dacf613235ac33.