Another Minor Refactor