cleaning up params a little