Cleanup the code.
Merge pull request #6322 from edx/anton/edxnotes-cleanup

Student Notes: cleanups.