Revert "Minor Changes"

This reverts commit 8b4ab84aa54d1aa13209e3ce49ba133b13e71d69.
Revert "Revert "Minor Changes""

This reverts commit 9206f40603eba52f9ebb3d773185cbd4f966d615.