refactor leon, improve hell claw