Refactor Entries Controller