Refactoring, moving creation of entries to own method