Revert "Minor changes"

This reverts commit 9fbafd62c84e7e2a83ae45d72e9ffe65d56b62f3.
Revert "Minor changes"

This reverts commit 3f208e481bd5970f1bdcf186dc3613335c447fb9.