Revert "Some minor changes"

This reverts commit 3e26415973193c8c5f0e32f3136cab333efbbe00.
bliblop