ParametersForSolver changes
clean up
indentation