moving variables to macros for ease of use