Reformat all vanilla code and generify some array lists