Reorganize script headers, indent properly