Revert "Minor Changes"

This reverts commit 0dba573eb2c48b25f1101e59bfb2043e21c28c0e.