Arrow spring clean up