Cleaned up column headers, need to verify long form requirements