Improve style
Fix Note adding