Revert "Minor changes"

This reverts commit 72b393f56e4afb916df04ea67f6b4f747e74158b.