Update defaults, clean styles

Fixes #35