Cleanup and Score Output added