Small updates
Revert "Small updates"

This reverts commit 24ab14b1139ecfbb87be3e7ac6b0bffe2ebe8427.