Refactor entry a little bit.