Big cleanup
Update status line