Simplify specs further