Removing initialier macro duplication