DRYing & cleaning