Revert "Some small changes"

This reverts commit a01aea8fe4f5761bd8552c689f15321cf9b3c56a.
Some small changes