Refactoring of entry to detail