Egg Code cleanup