1)separate Note from Module 2)change events constructors