More cleanups and organizations