Refactor HitEntity / Fix transition problem #22