Refactoring done (content extracted with extractor tool)