removed the notification code; formatted source for pep8 (almost)