Cleanup Hitter view 2