Format code, removing globals.
Minor - format code, removing comments.
Minor - Fixing PHP warnings, format code.
Teachers will get notifications see #7028