Refactor eggshell.