Simplify spec a bit