More organizing and cleanup.