Revert "a few minor changes"

This reverts commit f721f1bf9ab92c4402728147a02c33fb181e5533.