diff --git a/src/common/watchdog.h b/src/common/watchdog.h
index 479ef5b..c65856b 100644
--- a/src/common/watchdog.h
+++ b/src/common/watchdog.h
@@ -3,6 +3,14 @@
 
 #include "common/types.h"
 
+// Timeout Flags
+#define WDT2000 0x7  // 2000 ms
+#define WDT1000 0x6  // 1000 ms
+#define WDT500  0x5  //  500 ms
+#define WDT250  0x4  //  250 ms
+#define WDT100  0x3  //  100 ms
+// XXX: WDT...
+
 void  WDT_Enable(void);
 void  WDT_SetTimeoutFlag(byte flag);
 bool  WDT_HasTriggered(void);
diff --git a/src/main.c b/src/main.c
index 16c6290..d764866 100644
--- a/src/main.c
+++ b/src/main.c
@@ -50,7 +50,7 @@ int Init(void)
 		Info("Unexpected system reset.");
 
 	WDT_Enable();
-	WDT_SetTimeoutFlag(0x7); // 2 seconds
+	WDT_SetTimeoutFlag(WDT2000); // 2 seconds
 
 	// There is a possiblity to use interrupt signals
 	// for I2C communication but only as one large
@@ -96,30 +96,30 @@ int Init(void)
 
 void Update(void)
 {
-	float temp[3], rhum[3];
-	short raw[4];
+	float temp[3], rh[3];
+	short adc[4];
 
 	Info("Reading sensor values...");
 
 	I2C_SetChannel(AHT01);
-	I2C_AHT20_Read(&temp[0], &rhum[0]);
+	I2C_AHT20_Read(&temp[0], &rh[0]);
 
 	I2C_SetChannel(AHT02);
-	I2C_AHT20_Read(&temp[1], &rhum[1]);
+	I2C_AHT20_Read(&temp[1], &rh[1]);
 
 	I2C_SetChannel(AHT03);
-	I2C_AHT20_Read(&temp[2], &rhum[2]);
+	I2C_AHT20_Read(&temp[2], &rh[2]);
 
-	raw[0] = I2C_ADS1115_Read(0);
-	raw[1] = I2C_ADS1115_Read(1);
-	raw[2] = I2C_ADS1115_Read(2);
-	raw[3] = I2C_ADS1115_Read(3);
+	adc[0] = I2C_ADS1115_Read(0);
+	adc[1] = I2C_ADS1115_Read(1);
+	adc[2] = I2C_ADS1115_Read(2);
+	adc[3] = I2C_ADS1115_Read(3);
 
-	Info("TEM0=%.2fC, RH0=%.2f%%", temp[0], rhum[0]);
-	Info("TEM1=%.2fC, RH1=%.2f%%", temp[1], rhum[1]);
-	Info("TEM2=%.2fC, RH2=%.2f%%", temp[2], rhum[2]);
-	Info("ADC0=%04X, ADC1=%04X, ADC2=%04X, ADC3=%04X",
-		raw[0], raw[1], raw[2], raw[3]);
+	Info("TEMP0=%.2fC, RH0=%.2f%%", temp[0], rh[0]);
+	Info("TEMP1=%.2fC, RH1=%.2f%%", temp[1], rh[1]);
+	Info("TEMP2=%.2fC, RH2=%.2f%%", temp[2], rh[2]);
+	Info("ADC0=%04X, ADC1=%04X", adc[0], adc[1]);
+	Info("ADC2=%04X, ADC3=%04X", adc[2], adc[3]);
 }
 
 int main(void)