cleanup TODOs and add enum instead of #defines for msgId