Major Refractor Action

Changed ~98% of the #define macros to constants because they didn't need
to be macros.