Reduce the number of calls to Redis during score()
Cleanup in upstream.c
Update usage printer