Refactoring of tagapp