Clean up configuration, use undefined for defaults

Fixes #33