Clean up and miniziming