refactor notify methods; closes issue #17