Killed all-caps headers, bit of spacing