Rearranging some commentary