refactored account model & added notes