Revert "Small changes"

This reverts commit 228779218566d921ef0dc038701b98bd6a3cb83d.