some prettifying and exercise ordering