Clean up and Adjustments