Moved constant definitions to constants.h and #included constants.h