Add own name; refactoring