Refactor the EggShell.