[WIP] Style changes

Fixes #15.