Revert "A few adjustments"

This reverts commit a49ab22578bfcc725b81493a6178c74a9d273c5c.