Minor refactoring. Reloading content optimizations.