Change variables to use #define