Revert "Minor changes"

This reverts commit e4d53fbc64ff666e2396d5190ce547c794f51816.