Revert "Revert "minor changes""

This reverts commit 78b63e762b033b032c65acda9fd2b98f031b64a3.