Refactor Macroed class