Basic cleanup, now uses literal syntax for arrays