Cleanup
Cleanup
minor
Cleanup
Ready to turn a bunch of bool flags to a flag list