Refactor Content