refactor + title