Improve comment and arg name