Clean up a bit
Clean up some
Update report