Refactor

Clean up Macros for CObject.