organize.

no objections from @davecgh