Fix economy animation
Clean up code