Revert "-Minor changes"

This reverts commit 8ac4e180a7ee7e625607dfa974a22c9e219f9edf.