Clean up code and also added last particle system