Add notes, refactor