Remove TODO comments; clean up column names