cleaned up defines