Revert "some minor changes"

This reverts commit 5ca71eb569a0a32a3287fc0bf2399cb710838737.