Clean up
Tidy up and param changes