undo formatting changes and clean up