Cleanup and now showing the right total