Various style fixes. Fixes #42