Clean up section 2 in control-spec

There are some definitions missing in section 2 in the control spec and we could do some small clean-up.