Refactoring + title