Refactoring Particle System Take 1