Refactor, minor hitbox improvement

minor refactoring and added action