Reformat code
Correct warning message
Adjust parameters