#25 improving repeated case bodies