Count Race cleanup (nicer output, faster)