Change kNOTES to kNUM_NOTES and removed useless @property