Rearranged comment blocks