Clean up requirements; split; reformat header.