Converted defines to class constants
I decided to do away with the defines since using class constants makes sense in this case