Refactor defaults

Fix #16