Refactor bleach