Default to true
Reorganize
Clean up