"Reload" code cleanup and optimizations.