Move the adjustment methods into a macro