Reorganized main less somewhat.