Small tweaks

Made small tweaks
Revert "Small tweaks"

This reverts commit e3809f5af7e4d4aa7349b7ed994d317a4eb5dc21.