Removed unnecessary formatting changes
Undo reverting commit 0ebae2c990b08353fb6cc3ebab0819c394afd619
Change to pass macro paramaters as class attributes