Issue #58: Minor rearranging