Tidy, comment & add headers