Refactor EnderBow