Fix heading formatting, separate into two files