Move the Notification code into its own file.
Simplify many of the documentation comments.