spec: a bit of cleanup