Cleanup some styles.

Fixes #650