Revert "Some minor changes"

This reverts commit 84e1fb11de3a3e57f9c8184b9817fc461e5fd226.