Fix top-comment header and some indentation