First pass refactor for title context