Add best default options. Clean up code a bit.