Proofread and improve some steps