Code cleanup & half-done particle system