Add spaces to remaining control stuctures