Simplify parameters even more