Cleaned up ContentInitializer.