Simplify #reconfigure
Organize options