refactoring of /content/ section