Moving constants to #define