formatting and file cleanup