diff --git a/main.c b/main.c
index 2e35977..11ea6b4 100644
--- a/main.c
+++ b/main.c
@@ -45,7 +45,8 @@ char rcol_values[MAX_RCOL][RCOL_LEN];
 struct counters rcol_ctr[MAX_RCOL] = {0};
 
 unsigned rcol_lut(unsigned hash) {
-  for (unsigned *p = rcol_hashes; *p; p++)
+  unsigned *p;
+  for (p = rcol_hashes; *p; p++)
     if (*p == hash)
       return p - rcol_hashes + 1;
   return 0;
@@ -86,7 +87,7 @@ void finish(int last_lc, unsigned last_rcol_idx) {
 
 int main(int argc, char **argv) {
   int lcol_width;
-  int last_lc = 0;
+  unsigned last_lc = 0;
   char *p, *lcol, *rcol;
   unsigned lcol_hash, rcol_hash, rcol_idx, last_rcol_idx = 0,
                                            actual_last_rcol_idx, i, j, pfs_mode;
@@ -132,9 +133,9 @@ int main(int argc, char **argv) {
     rcol_idx = rcol_lut(rcol_hash);
     if (rcol_idx == 0) {
       rcol_idx = ++num_rcol;
-      // TODO: validate length
+      /* TODO: validate length */
       rcol_hashes[rcol_idx - 1] = rcol_hash;
-      // TODO: validate length
+      /* TODO: validate length */
       strcpy(rcol_values[rcol_idx - 1], rcol);
     } else if (rcol_idx <= last_rcol_idx && last_rcol_idx != 0) {
       err_misfmt_input("ordering different from last time");
@@ -197,4 +198,6 @@ int main(int argc, char **argv) {
     printf(HRED "  %u failed" RESET "\n", sum.pfs[1]);
   if (sum.pfs[2])
     printf(HYELLOW "  %u skipped" RESET "\n", sum.pfs[2]);
+
+  return 0;
 }