Revert "Minor changes"

This reverts commit 8b03ed4bc385e7ce842f28f74774d6d44c7b861c.