Notes Repository; Note refractoring