Cleanup and adjustments!