Revert "Minor changes"

This reverts commit dd01c95c030edf450ed878eaf239998615592fd1.