Fixed arrow infinite firing, cleaned code