Keep to spec for now

We can make it easier to curl later
Tidy a little