Internal clean up, added some devs