cleanup continues, formatting, etc