cleanup DamageListener, remove code duplication