Some code cleanup, Begin Orcs