Minor rearranging & cleanup