Refactoring, working with tagline