Clean up and resize