Formatting
New Class
Revert "Formatting"

This reverts commit d4b97eacc9d67fc8b64638b625efa609abaf2073.
Forgot ECO
New Class
Finalized vars