Refactor, and add brand, timing, and frequency