More cleanups, clearer layout.