Revert "Minor Changes"

This reverts commit 4b0187076ab5c7611074cbe5a1d1add111948424.