Improved DRY.