Refactor: Inline macro
Refactor: Replace macro with inline function