Got rid of the age old #defines