Refactoring how content gets rendered