Revert "Minor changes"

This reverts commit 2349aa7b2f13f3109fb93f3ca16e3354f0c59af7.