Removing more egg artifacts committed by mistake
Several cosmetic and PEP8 fixes.