Cleanup and adjustments