Did refactoring for static contents