content directive refactor