Remove debug param from best_version and other cosmetic changes