Refactoring for neatness because Barny told me to.