Minor rearranging.