Refactor macros and pluralization