Refactoring - split entry view