Minor content refactoring