DRYed up some minor points