refactor create entry to be more straightforward