Clean up code and params