Clean up method argument names