Common / Gutterball / Candlepin refactoring