Improving naming, formatting and fixing --cross-validation-rate related code