Clean up and improve configure