Use named parameter
Fix function comment
Fix scenario descriptions